Skip to content

Fix - Pay with BA-User is navigated to the Inbox instead of report after exiting "Add BA" modal #95822

Merged
mountiny merged 9 commits into
Expensify:mainfrom
software-mansion-labs:fix/add-bank-account-back
Jul 23, 2026
Merged

Fix - Pay with BA-User is navigated to the Inbox instead of report after exiting "Add BA" modal #95822
mountiny merged 9 commits into
Expensify:mainfrom
software-mansion-labs:fix/add-bank-account-back

Conversation

@jmusial

@jmusial jmusial commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

When a nested navigator hasn't been hydrated yet, React Navigation stores the navigation intent verbatim as NavigatorScreenParams ({screen, params, path}) on the route, and its default serializer turns that into a malformed URL like /?params=[object Object], which then poisons backTo values and sends users to the Inbox on back navigation.

getPathFromState now detects this unresolved hint chain on the focused route and returns the real target URL embedded in params.path instead of falling through to React Navigation's serializer.

Fixed Issues

$ #96153

PROPOSAL:

Tests

  1. Open app
  2. Tap “+” button, select “Create a workspace”
  3. Navigate to the Inbox tab - tap FAB - create an expense
  4. Tap Submit on the expense preview, then Approve
  5. Navigate to the Spend tab > Expenses
  6. Click on the Expense
  7. Click on the Pay Button > Pay with business account
  8. Enter the magic code
  9. Tap Back button on the “Add bank account” modal
  10. Verify that user is navigated back to the expense report in the Spend tab

Offline tests

Same as tests

QA Steps

Same as tests.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

iOS: Native
Screen.Recording.2026-07-21.at.11.32.13.mov

@jmusial

jmusial commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@jmusial jmusial changed the title Fix add bank account back Fix - Pay with BA-User is navigated to the Inbox instead of report after exiting "Add BA" modal Jul 21, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bae18e487a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/libs/Navigation/helpers/getPathFromState.ts Outdated
@jmusial

jmusial commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dfd639fd5e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/libs/Navigation/helpers/getPathFromState.ts Outdated

@WojtekBoman WojtekBoman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@codecov

codecov Bot commented Jul 21, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/components/SettlementButton/index.tsx 82.19% <100.00%> (ø)
src/components/KYCWall/BaseKYCWall.tsx 27.16% <0.00%> (-0.16%) ⬇️
src/components/Search/SearchBulkActionsButton.tsx 1.42% <0.00%> (-0.03%) ⬇️
... and 205 files with indirect coverage changes

@jmusial

jmusial commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 704cae834a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/components/SettlementButton/index.tsx
@jmusial
jmusial marked this pull request as ready for review July 22, 2026 08:01
@jmusial
jmusial requested review from a team as code owners July 22, 2026 08:01
@melvin-bot
melvin-bot Bot requested review from aimane-chnaif and heyjennahay and removed request for a team and heyjennahay July 22, 2026 08:01
@melvin-bot

melvin-bot Bot commented Jul 22, 2026

Copy link
Copy Markdown

@aimane-chnaif Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team July 22, 2026 08:01
@aimane-chnaif

aimane-chnaif commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
android.mov
Android: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov

@aimane-chnaif

Copy link
Copy Markdown
Contributor

Please pull main

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

Reviewed commit: 704cae834a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@MelvinBot

Copy link
Copy Markdown
Contributor

Review

The localized fix is sound and low-risk: making addBankAccountRoute an optional thunk and resolving it at press time in BaseKYCWall.tsx:243 means Navigation.getActiveRoute() (and therefore backTo) is evaluated after the nested navigator is hydrated, instead of at render time when it can serialize to a malformed URL. The union type change is backward compatible — the typeof … === 'function' guard still accepts plain Route callers like ReimbursementQueuedContent.tsx:78. No correctness issues found in the diff itself.

A few things worth addressing before this merges:

1. The PR description no longer matches the code (please update). The "Explanation of Change" describes a getPathFromState serializer fix ("returns the real target URL embedded in params.path"), but the diff contains no getPathFromState change — the commit history (choose localized fix, cleanup) shows the approach was swapped to deferring route construction. Update the description so reviewers and QA understand what actually changed.

2. Tests checklist claims a unit test was added, but there's no test file in the diff. The author checklist marks "I added unit tests… to prevent regressions in this user flow", yet the 4 changed files are all source. A regression test around the deferred-backTo behavior would be valuable here since this is a timing/hydration bug that's easy to reintroduce — or uncheck the box if a unit test isn't practical for this navigation flow.

3. This fixes the symptom at these two entry points, not the underlying root cause. The stale description's own explanation points at getActiveRoute() returning /?params=[object Object] while a nested navigator is unhydrated. This PR only defers the two KYCWall payment callers (SettlementButton/index.tsx:679, SearchBulkActionsButton.tsx:162). Any other spot that captures a backTo from Navigation.getActiveRoute() at render time during an unhydrated state could hit the same bug. The targeted fix is acceptable for closing #96153, but consider a follow-up to harden the serializer so this class of bug can't recur elsewhere.

Minor / non-blocking
  • The thunk is a new function identity on every render, so continueAction's useCallback (which lists addBankAccountRoute in its deps at BaseKYCWall.tsx:254) is recreated each render. This was effectively already true when the route string was recomputed each render, so it's not a regression — just noting it isn't a perf win either.
  • The only failing check is PR Author Checklist / checklist, which is expected until the checklist items are ticked; all functional checks (typecheck, tests, lint, perf) pass.

@melvin-bot
melvin-bot Bot requested review from mountiny and youssef-lr July 22, 2026 16:23
@mountiny
mountiny merged commit 431548e into Expensify:main Jul 23, 2026
38 of 41 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 mountiny has triggered a test Expensify/App build. You can view the workflow run here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants